IT FIM- Refactor Registry file limit tests #2478

Deblintrake09 · 2022-01-25T20:47:17Z

Related issue
#2353

Description

In this PR the following changes were made:

Refactor test_registry_file_limit folder to new Standard
Blocked test_registry_limit_values.py because of wazuh/wazuh issue #11819
Refactor some of the tests in test_registry_report_changes removed
Removed Time Travel from all tes_registry_report_changes tests that were refactored
Improved Times on tests without time travel by 20-33%
Created new test test_registry_disk_quota_bigger_file_limit
Skipped test_report_changes_after_restart because of flaky behaviour in Jenkins. Added to Issue [#2174]

Configuration options

Windows Agent Package: 4.3.0-1

Local Internal Options

syscheck.debug=2
windows.debug=2
agent.debug=2
monitord.rotate_log=0

Tests

Type	Jenkins	Local Results	Date	By
Windows	🟢	🟢	2022/02/02	@Deblintrake09
Windows	🟢	🟢	2022/02/02	@Deblintrake09
Windows	🟢	🟢	2022/02/02	@Deblintrake09
Linux	🟢	🟢	2022/02/02	@Deblintrake09
Linux	🟢	🟢	2022/02/02	@Deblintrake09
Linux	🟢	🟢	2022/02/02	@Deblintrake09
Manager	🟢	🟢	2022/02/02	@Deblintrake09
Manager	🟢	🟢	2022/02/02	@Deblintrake09
Manager	🟢	🟢	2022/02/02	@Deblintrake09

Proven that tests pass when they have to pass.
Proven that tests fail when they have to fail.

Python codebase satisfies PEP-8 style style guide. pycodestyle --max-line-length=120 --show-source --show-pep8 file.py.
Python codebase is documented following the Google Style for Python docstrings.
The test is documented in wazuh-qa/docs.

deps/wazuh_testing/wazuh_testing/fim.py

deps/wazuh_testing/wazuh_testing/fim_module/fim_variables.py

...ation/test_fim/test_registry/test_registry_file_limit/test_registry_limit_capacity_alerts.py

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_full.py

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_values.py

...est_registry/test_registry_report_changes/test_disk_quota/test_registry_disk_quota_values.py

.../test_fim/test_registry/test_registry_report_changes/test_registry_diff_size_limit_values.py

...ration/test_fim/test_registry/test_registry_report_changes/test_registry_file_size_values.py

...ation/test_fim/test_registry/test_registry_file_limit/test_registry_limit_capacity_alerts.py

deps/wazuh_testing/wazuh_testing/tools/file.py

...m/test_registry/test_registry_report_changes/data/wazuh_registry_diff_size_limit_values.yaml

damarisg · 2022-01-27T17:43:45Z

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_full.py

- assert database_state == '100', 'Wrong value for full database alert.'
- else:
- pytest.fail('Did not receive the value of the database state,')
+ assert database_state == '100', ERR_MSG_WRONG_VALUE_FOR_DATABASE_FULL


Also, Could you change the 'ossec.log' name in the documentation, please?? You could change it by the wazuh logs, or something like that.
Because on 5.0 the ossec.log wil change to wazuh.log

...y/test_registry_report_changes/test_disk_quota/test_registry_disk_quota_bigger_file_limit.py

...est_registry/test_registry_report_changes/test_disk_quota/test_registry_disk_quota_values.py

CamiRomero

GJ! but some changes are required

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_full.py

.../test_fim/test_registry/test_registry_report_changes/test_registry_diff_size_limit_values.py

CamiRomero · 2022-02-02T15:45:10Z

...ration/test_fim/test_registry/test_registry_report_changes/test_registry_file_size_values.py

 test_data_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data')
 wazuh_log_monitor = FileMonitor(LOG_FILE_PATH)
-reg1, reg2 = test_regs
-size_limit_configured = 10 * 1024
+size_limit_configured = SIZE_LIMIT_CONFIGURED_VALUE


Use directly SIZE_LIMIT_CONFIGURED_VALUE instead of defining a new variable size_limit_configured

CamiRomero · 2022-02-02T18:26:52Z

Test path	Execution	OS	Type	Version	Date	Status	Executed by	Note
test_fim/	Jenkins	Windows	Agent	4.3.0	01/02/2022	🔴	Camila	Two test fails. Test: test_basic_usage_registry_baseline_generation.py
test_fim/	Jenkins	Windows	Agent	4.3.0	01/02/2022	🔴	Camila	One test fail. Test : test_registry_report_changes_deleted.py
test_fim/	Jenkins	Windows	Agent	4.3.0	01/02/2022	🔴	Camila	One test fail. Test: test_registry_report_changes_deleted.py

Test path	Execution	OS	Type	Version	Date	Status	Executed by	Note
test_fim/	Jenkins	MacOS	Agent	4.3.0	01/02/2022	🔴	Camila	One test fail. Test: test_basic_usage_realtime_unsupported.py
test_fim/	Jenkins	MacOS	Agent	4.3.0	01/02/2022	🟢	Camila
test_fim/	Jenkins	MacOS	Agent	4.3.0	01/02/2022	🟢	Camila

Test path	Execution	OS	Type	Version	Date	Status	Executed by
test_fim/	Jenkins	Centos	Agent	4.3.0	01/02/2022	🟢	Camila
test_fim/	Jenkins	Centos	Agent	4.3.0	01/02/2022	🟢	Camila
test_fim/	Jenkins	Centos	Agent	4.3.0	01/02/2022	🔵	Camila

Test path	Execution	OS	Type	Version	Date	Status	Executed by
test_fim/	Jenkins	Centos	Manager	4.3.0	01/02/2022	🟢	Camila
test_fim/	Jenkins	Centos	Manager	4.3.0	01/02/2022	🟢	Camila
test_fim/	Jenkins	Centos	Manager	4.3.0	01/02/2022	🟢	Camila

Test path	Execution	OS	Type	Version	Date	Status	Executed by
test_fim/	Jenkins	Solaris	Agente	4.3.0	02/02/2022	🟢	Camila
test_fim/	Jenkins	Solaris	Agente	4.3.0	02/02/2022	🟢	Camila
test_fim/	Jenkins	Solaris	Agente	4.3.0	02/02/2022	🟢	Camila

deps/wazuh_testing/wazuh_testing/fim_module/fim_variables.py

damarisg · 2022-02-03T13:10:19Z

tests/integration/test_fim/test_registry/test_registry_file_limit/data/wazuh_conf.yaml

- - MODULE_NAME
+ - test_registry_limit_capacity_alerts
+ - test_registry_limit_full
+ - test_registry_limit_values


Why did you change it?

...ation/test_fim/test_registry/test_registry_file_limit/test_registry_limit_capacity_alerts.py

damarisg · 2022-02-03T13:45:20Z

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_full.py

- realtime: Enable real-time monitoring on Linux (using the 'inotify' system calls) and Windows systems.
- whodata: Implies real-time monitoring but adding the 'who-data' information.


Why did you delete these? Is it not working with real-time mode and whodata mode?

tests/integration/test_fim/test_registry/test_registry_file_limit/test_registry_limit_values.py

damarisg · 2022-02-03T14:15:19Z

...y/test_registry_report_changes/test_disk_quota/test_registry_disk_quota_bigger_file_limit.py

+
+@pytest.mark.parametrize("size", [(8192), (32768)])


Please add a comment explaining what these numbers mean. We know it, but this test must be clear to external teams.

...y/test_registry_report_changes/test_disk_quota/test_registry_disk_quota_bigger_file_limit.py

damarisg · 2022-02-03T14:24:49Z

...ration/test_fim/test_registry/test_registry_report_changes/test_registry_file_size_values.py

-@pytest.mark.parametrize('size', [
- (4 * 1024),
- (16 * 1024),
+@pytest.mark.parametrize('size', [(4096), (16384)])


Please add a comment explaining what these numbers mean. We know it, but this test must be clear to external teams.

Co-authored-by: Dámaris <[email protected]>

damarisg

Type	Test Path	Jenkins	Date	By
Windows	test_fim/	🟢 🟢 🟢	2022/02/10	Seyla
Linux Agent	test_fim/	🟢 🟢 🟢	2022/02/10	Seyla
Manager	test_fim/	🟢 🟢 🟢	2022/02/10	Seyla

Well done!

Deblintrake09 · 2022-02-14T14:31:56Z

Type	Test Path		Date	By
Windows	test_fim/	🟢	2022/02/14	@Deblintrake09
Linux Agent	test_fim/	🟢	2022/02/14	@Deblintrake09
Manager	test_fim/	🟢	2022/02/14	@Deblintrake09

CamiRomero · 2022-02-22T17:38:25Z

Type	Test Path	Jenkins	Date	By
Windows	test_fim/	🟢 🟢 🟢	22/02/2022	@CamiRomero
Linux Agent	test_fim/	🟢 🟢 🟢	22/02/2022	@CamiRomero
Manager	test_fim/	🟢 🟢 🟢	22/02/2022	@CamiRomero

Deblintrake09 changed the title ~~2353 Refactor Registry file limit tests~~ IT - Refactor Registry file limit tests Jan 25, 2022

Deblintrake09 added feature/fim subteam/qa-storm labels Jan 25, 2022

Deblintrake09 requested review from CamiRomero and damarisg January 25, 2022 21:31

Deblintrake09 linked an issue Jan 25, 2022 that may be closed by this pull request

IT FIM: Refactor 'test_registry' according to new standard (4) #2353

Closed

CamiRomero suggested changes Jan 26, 2022

View reviewed changes

damarisg requested changes Jan 27, 2022

View reviewed changes

Deblintrake09 requested review from damarisg and CamiRomero January 27, 2022 20:40

Deblintrake09 added 2 commits February 2, 2022 15:38

rem - remove unnecesary variable asignment

8ee732a

fix - remove duplicated entry from changelog

dc8c9db

CamiRomero suggested changes Feb 2, 2022

View reviewed changes

Deblintrake09 requested a review from CamiRomero February 2, 2022 15:59

Deblintrake09 added 2 commits February 2, 2022 18:55

skip test_report_changes_after_restart - flaky

614c293

Merge branch 'master' into 2353-refactor-registry-file-limit

8fd4e9b

damarisg assigned Deblintrake09 Feb 3, 2022

damarisg requested changes Feb 3, 2022

View reviewed changes

Deblintrake09 and others added 2 commits February 3, 2022 15:29

modify: test skip type and minor typo

43119ce

Co-authored-by: Dámaris <[email protected]>

fix - comments and documentation

db939b2

damarisg changed the title ~~IT - Refactor Registry file limit tests~~ IT FIM- Refactor Registry file limit tests Feb 9, 2022

damarisg previously approved these changes Feb 10, 2022

View reviewed changes

Merge branch 'master' into 2353-refactor-registry-file-limit

3526d2a

Deblintrake09 dismissed damarisg’s stale review via 3526d2a February 11, 2022 15:27

CamiRomero added 2 commits February 22, 2022 09:01

Merge branch 'master' into 2353-refactor-registry-file-limit

79d16f2

Update CHANGELOG.md

67cbad9

damarisg approved these changes Mar 7, 2022

View reviewed changes

snaow merged commit ab0951c into master Mar 7, 2022

snaow deleted the 2353-refactor-registry-file-limit branch March 7, 2022 17:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IT FIM- Refactor Registry file limit tests #2478

IT FIM- Refactor Registry file limit tests #2478

Deblintrake09 commented Jan 25, 2022 •

edited

Loading

damarisg Jan 27, 2022

CamiRomero left a comment

CamiRomero Feb 2, 2022

CamiRomero commented Feb 2, 2022 •

edited

Loading

damarisg Feb 3, 2022

damarisg Feb 3, 2022

damarisg Feb 3, 2022

damarisg Feb 3, 2022

damarisg left a comment

Deblintrake09 commented Feb 14, 2022 •

edited by damarisg

Loading

CamiRomero commented Feb 22, 2022

		realtime: Enable real-time monitoring on Linux (using the 'inotify' system calls) and Windows systems.
		whodata: Implies real-time monitoring but adding the 'who-data' information.

IT FIM- Refactor Registry file limit tests #2478

IT FIM- Refactor Registry file limit tests #2478

Conversation

Deblintrake09 commented Jan 25, 2022 • edited Loading

Description

Configuration options

Windows Agent Package: 4.3.0-1

Local Internal Options

Tests

damarisg Jan 27, 2022

Choose a reason for hiding this comment

CamiRomero left a comment

Choose a reason for hiding this comment

CamiRomero Feb 2, 2022

Choose a reason for hiding this comment

CamiRomero commented Feb 2, 2022 • edited Loading

damarisg Feb 3, 2022

Choose a reason for hiding this comment

damarisg Feb 3, 2022

Choose a reason for hiding this comment

damarisg Feb 3, 2022

Choose a reason for hiding this comment

damarisg Feb 3, 2022

Choose a reason for hiding this comment

damarisg left a comment

Choose a reason for hiding this comment

Deblintrake09 commented Feb 14, 2022 • edited by damarisg Loading

CamiRomero commented Feb 22, 2022

Deblintrake09 commented Jan 25, 2022 •

edited

Loading

CamiRomero commented Feb 2, 2022 •

edited

Loading

Deblintrake09 commented Feb 14, 2022 •

edited by damarisg

Loading